switched over to master so we can use 3.6 beta, bleeding edge stuff