opencv2 2.4.6
Merge pull request #1391 from vrabaud/master

opencv2 2.4.6