Merge remote-tracking branch 'upstream/master' into devel-merge
Fixing rubocop by replacing raise with fail in a couple of places.