Moved across change that makes Redactor work into 2.0