1. 2016-11-08 [konqueror] /: Merge branch 'activitymanager Ivan Čukić 2. 2016-11-08 [konqueror] /: Merge branch 'activitymanager Sebastian Trueg