Resync Master Branch with Next Branch 

The Next branch is now the latest and greatest code...