Merge branch 'development' of github.com:aakb/vagrant into development
Issue #8686 by tuj: Added allowing other origins to /ik-templates/