refs #1544 change O Substantives
refs #1544 make aError() share
Merge branch 'master' into akouryy_ja