Commit before merge of learnsign.org.nz codebase