Bringing branch up to date

This will now be the main branch where commits will be made, hotfixes will be pushed into master and then stable.