Merge remote-tracking branch 'walterbender/master'

Bringing my version up to date.