Update master for Puppet 3.