Trying to pull in changes from cjdev:master

Do not approve if I'm doing this wrong.