Merge branch 'release-1.27' of github.com:ZoneMinder/ZoneMinder into release-1.27
Merge branch 'release-1.27' of github.com:kylejohnson/ZoneMinder into release-1.27