Merge branch 'master' into wip
Merge branch 'pr/93' into wip
Merge branch 'wip' of https://github.com/munkireport/munkireport-php into bisd-development

# By Arjen van Bochoven
# Via Arjen van Bochoven
* 'wip' of https://github.com/munkireport/munkireport-php:
  Merge branch 'pr/93' into wip
  Merge branch 'master' into wip
Merge branch 'bisd-development' of https://github.com/clburlison/munkireport-php into bisd-current