Merge branch '2016.03' of https://gerrit.tine20.org/tine20/p/tine20 into 2016.03