Merged remote-tracking branch 'origin/master'.

Fixed conflict in utils/trivial-validate.py.