Fox-McCloud/Paradise — pull request #46 by Fox-McCloud (2014-11-12 14:01:16+00:00)
Title: Revert "Revert "Merge from Master""

Reverts Fox-McCloud/Paradise#45