Added some official sounding stuff to a file.
Merge branch 'master' into my-topic