more minor updates, untrack /bin
Merge remote-tracking branch 'origin/dev-branch' into dev-branch