ilyfa/Pantastic — pull request #1 by ilyfa (2013-08-18 12:10:02+00:00)
Title: Merge remote-tracking branch 'Pantastic/master' into Pantastic-proto

* Pantastic/master: