Markolie/Paradise — pull request #6 by Markolie (2014-11-27 20:20:32+00:00)
Title: Upstream merge

Upstream merge