Merge branch 'master' into winbuffers

This commit is contained in:
James Booth
2014-06-29 19:35:28 +01:00