more nice stuff with worklogs
Merge branch 'develop'