Merge branch 'thefiddler-cursor' into develop
authorthefiddler <stapostol@gmail.com>
Mon, 28 Apr 2014 07:38:54 +0000 (09:38 +0200)
committerthefiddler <stapostol@gmail.com>
Mon, 28 Apr 2014 07:38:54 +0000 (09:38 +0200)

Trivial merge