ZomgPonies/Paradise — pull request #175 by alex-gh (2014-03-24 01:51:41+00:00)
Title: Fixes and cherrypicks

See commits for details.