cc
Merge branch 'tumblr-style-editor-controls' into jamon_improvements