Merge branch 'COM_test' of https://github.com/gumallett/Sync into COM_test