Merge remote branch 'origin/develop' into armv7
authorwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 17:18:40 +0000 (18:18 +0100)
committerwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 17:18:40 +0000 (18:18 +0100)

Trivial merge