started 'follow the leader'
Merge remote-tracking branch 'upstream/master'