Merge branch 'external' into develop
authorthefiddler <stapostol@gmail.com>
Sat, 28 Dec 2013 00:27:49 +0000 (01:27 +0100)
committerthefiddler <stapostol@gmail.com>
Sat, 28 Dec 2013 00:27:49 +0000 (01:27 +0100)

Trivial merge