Merged trunk into project Image-Layers. Includes r59693 to r59721.