Cleaner comment.
Merge branch 'master' into temp