Allow custom users
Fixed mispelling of maintainer
Merge remote-tracking branch 'essencedigital/master'