small fix to mayLocks.ml
HTML output fixes
Merge remote-tracking branch 'upstream/master'