Merge branch 'master' into eduard
Search widget inline formatting fix.
Merge branch 'eduard'