Merge "Remove annoying log message" into devel/master