minor style update
Merge branch 'master' into add_image_uploader_to_work