proofpoint/platform — pull request #177 by johngmyers (2013-03-25 17:45:55+00:00)
Title: Merge changes from airlift

Changes from Airlift that required enough conflict resolution to merit review.