Anastomose/PyFile — pull request #1 by Anastomose (2014-10-22 22:17:36+00:00)
Title: Conflict merge

Here's the conflict merge.