lift/framework — pull request #1512 by Shadowfiend (2014-01-18 23:59:32+00:00)
Title: master -> Lift 30 merge

Let's see if I screwed anything up!

(Answer: guaranteed yes.)