Some minor cleaning up [ci skip].
Merge remote-tracking branch 'origin/master' into issue470