Point to the bleeding-edge Dev branch from Master
Merge branch 'master' into dev