Fix bug in crop picture view.
Merge branch 'refs/heads/2.7-stable'