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