SOS18
Merge branch 'master' of github.com:mantidproject/documents