Update to changes in master. Reviewed By: JacquesLucke Differential Revision: http://developer.blender.org/D10211