Merge branch 'release/0.2.16.1' into develop
authorJan Dittberner <jan@dittberner.info>
Sat, 16 Feb 2013 10:35:01 +0000 (11:35 +0100)
committerJan Dittberner <jan@dittberner.info>
Sat, 16 Feb 2013 10:35:01 +0000 (11:35 +0100)

Trivial merge