Merge remote-tracking branch 'origin/tidy' into dev
Merge remote-tracking branch 'origin/btsync' into dev