Markolie/Paradise — pull request #2 by Markolie (2014-11-07 10:58:01+00:00)
Title: Upstream sync

Upstream sync