post-1.6-cn-fixes-1
86921f79 · Merge pull request #869 from rewbs/rewbs/a1111-1.6-cn-hack ·