MacEdit3
Merge branch 'MacEdits3' into gh-pages