gryffon/eggofpanku — pull request #28 by gryffon (2014-04-19 20:42:54+00:00)
Title: Bring up to date with master

Bring up to date with master