use latest and greatest ;)
Merge remote-tracking branch 'upstream/master'