Fox-McCloud/Paradise — pull request #33 by Fox-McCloud (2014-11-08 05:37:59+00:00)
Title: Merge From Master

Merge Conflict