Merge branch 'PIctureDimensions'
Revert "Merge branch 'PIctureDimensions'"

This reverts commit 1199e3b58b014b11c6fcc402a464934d3c114ceb, reversing
changes made to b48cd32a14ac328d5284aa8f5318ef1f22004234.
Merge branch 'PIctureDimensions'
Merge branch 'master' into PIctureDimensions