Merge branch 'master' into dev
Merge branch 'dev' of github.com:Connexions/oer.exports into dev
Merge branch 'dev' of github.com:Connexions/oer.exports into dev