Merge remote-tracking branch 'upstream/master' into boundingbox
Merge branch 'boundingbox' into cvpr2015