Merge branch 'develop' into 032-Node_photo_listing_theming
Features minor fix.
Merge branch '032-Node_photo_listing_theming' into develop