Fix `include()` result when having no alias
Issue 7015: Broken styles for search elements
Catch exceptions in editor.hide (related to issue 6938)

https://code.google.com/p/fbug/issues/detail?id=6938
Merge branch 'master' into jsd2