Merge branch 'development' of
https://github.com/ProjectWaffle/framework.git into development