Commit prior to merging, no changes from last commit, minor housekeeping