Merge branch '2.0' into gallery-shortcode
Merge branch '2.0' into gallery-shortcode
Fixes #182
Merge branch 'gallery-shortcode' into 2.0
Merge branch '2.0' of https://github.com/bigspring/monolith into 2.0