Merged master branch into dev/timesync.

To do this merge I ran:

git merge --strategy-option ours master
git rm -r src/pyacomms # resolves conflict and can now be merged