#19692 WIP
Merge branch 'master' into 19692
WIP #19692
Merge with upstream master
#19692 WIP
#19692 Functional
#19692 Final tweaks
#19692 Fix invalid HTML
#19692 Fix strange refresh due to .editable class
Merge pull request #136 from ncatanchin/19692

Code Review for Job #19692