opencv 2.4.9
Merge branch 'master' into dev