ESSENTIALS-344: Final(!) updates.
Merge branch 'master' of github.com:onehippo/essentials