Merge branch 'SWC-1064-bootstrap' of ssh://github.com/jay-hodgson/SynapseWebClient into release-26
Merge pull request #772 from jay-hodgson/release-26

Release 26
Merge branch 'release-26' into develop