Netflix/Priam — pull request #202 by jasobrown (2013-04-11 21:17:14+00:00)
Title: forward-porting items from 1.1 to master

Cleaning up things we've been putting off forward-porting