back-merge Michael's changes from puppet master.