Merge remote-tracking branch 'nickvergessen/ticket/13381' into develop-ascraeus

This commit is contained in:
Marc Alexander 2014-11-25 23:15:03 +01:00
commit aa3a46a35f