Merge remote-tracking branch 'refs/remotes/origin/master' into untabify-and-fix-variable-name
Merge remote-tracking branch 'refs/remotes/origin/master' into untabify-and-fix-variable-name
Merge pull request #650 from garaemon/untabify-and-fix-variable-name

[image_view2] Untabify and fix variable name
Merge remote-tracking branch 'refs/remotes/origin/master' into separate-header-and-cpp-of-image-view2