sync loop-shortcode
Merge branch 'master' of https://github.com/ubc/loop-shortcode