Merge "use modern construct 'nullptr' instead of 'NULL' or '0'" into devel/master