phil
Merge remote branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
document editor select2 enhancements and a bug fix for validation
Merge remote branch 'upstream/master'