Merge remote-tracking branch 'upstream/master' into versionableDBO
authorKiv4h <jeffrey.reichardt@googlemail.com>
Wed, 19 Dec 2012 14:36:26 +0000 (15:36 +0100)
committerKiv4h <jeffrey.reichardt@googlemail.com>
Wed, 19 Dec 2012 14:36:26 +0000 (15:36 +0100)

Trivial merge