Merge branch 'master' into bmx6_testing
authorAxel Neumann <neumann@cgws.de>
Wed, 27 Nov 2013 10:55:52 +0000 (11:55 +0100)
committerAxel Neumann <neumann@cgws.de>
Wed, 27 Nov 2013 10:55:52 +0000 (11:55 +0100)

Trivial merge