Using a different builder syntax.  The older syntax was getting cumbersome.
Merge remote-tracking branch 'origin/master'