Merge branch 'rdp' into develop
authorthefiddler <stapostol@gmail.com>
Wed, 8 Jan 2014 23:19:42 +0000 (00:19 +0100)
committerthefiddler <stapostol@gmail.com>
Wed, 8 Jan 2014 23:19:42 +0000 (00:19 +0100)

Trivial merge