reformat
JRB-26 change the sync timer to use an executor
Merge remote-tracking branch 'github/master'