Merge remote-tracking branch 'remotes/smcv/ready/git-push-origin-master'