Updated for puppet 3.5.1