Auto-Commit Tue Sep 30 17:13:37 2014
Merge pull request #1 from clok/phmgmt

Clean up master