Merge master changes back to beta

Starting new testing for PS3 Controller. Merging master into clean beta branch.