Originally branched from 0.x, then rebased onto qa/0.x when that became available.  Pull request is still against 0.x, so it has 4 extra commits relating to AICs and non-unicode/base64 stuff.