bug 849434 - update vendor with new basket submodule
Merge pull request #991 from groovecoder/update-basket-submodule

bug 849434 - update vendor with new basket submodule
Don't brick saving templates
fix bug 858603 - Keep correct TOC level
Merge pull request #995 from darkwing/new-doc-toc

Don't brick saving *new* templates
Merge pull request #996 from darkwing/toc-doc-field

fix bug 858603 - Keep correct TOC level
fix bug 857566: Ensure _() imported in user/backends.py
fix bug 815768: Strip markup found inside <iframe>
Merge pull request #997 from lmorchard/857566-fix-user-admin

fix bug 857566: Ensure _() imported in user/backends.py
Merge pull request #998 from lmorchard/815768-filter-out-iframe-contents

fix bug 815768: Strip markup found inside <iframe>