Incorporates the new features of the development branch - this will become the new master in April 2015