Merge branch 'master' into develop
Merge branch 'develop' of github.com:antler/caribou-admin into develop
Minor fix, version bump