Perforce

Merge changes from perforce to master from 2014-01-08 and 2014-01-09