Merge pull request #1258 from jay-hodgson/release-64

update synapse version
done
removed extra to
Merge pull request #1259 from john-hill/SWC-1782-c

done
SWC-1828: merge fix to release-64