Merge remote-tracking branch 'origin/issue64' into develop
authorthefiddler <stapostol@gmail.com>
Sun, 16 Mar 2014 23:51:28 +0000 (00:51 +0100)
committerthefiddler <stapostol@gmail.com>
Sun, 16 Mar 2014 23:51:28 +0000 (00:51 +0100)

Trivial merge