Merge remote-tracking branch 'github/master' into pullreq/140319-PyrLKOpticalFlow