Merge branch 'master' into bmx6_testing
authorAxel Neumann <neumann@cgws.de>
Thu, 30 Jan 2014 04:47:01 +0000 (05:47 +0100)
committerAxel Neumann <neumann@cgws.de>
Thu, 30 Jan 2014 04:47:01 +0000 (05:47 +0100)

Trivial merge