Upgrade to CKEditor 4.2.1
Merge branch '3.2/master' into 3.3/develop