busy repo merge, no conflicts, I promise

This commit is contained in:
Pete Travis 2014-05-12 17:38:10 -06:00
commit 212918325a