Merge branch 'development'
Merge branch 'development'
Fix for rake spec test failing on Travis
Merge branch 'master' into development