3786 (again after lee overwrote changes)
Merge branch 'master' of https://github.com/Bookt/WP-InstaSites