Commits in opetus-ji/jot2012:master