Sync master branch with 2.0.0 in preparation for bringing puppet to master