qgeissmann Merge branch 'master' into opencv3_compat