Now using gallery_shortcode() instead of do_shortcode()
Merge branch 'master' into develop
Image link option