Markolie/Paradise — pull request #1 by Markolie (2014-11-06 11:33:28+00:00)
Title: Upstream sync

Upstream sync with Paradise.