Manually merging my dev_gijs back into master. Note to self: Use branching for small features and enhancements (using pull requests), not for diverging from mainline production for a week or more !
Merge branch 'master' of https://github.com/ddsc/webclient