Version updates

This change updates dependency versions.  This update includes an
update to Rubocop necessitating changes to the source code.
Merge remote-tracking branch 'upstream/master'