* master
  pedantic_warnings_nik