Bug 951507
Bug 951367
Merge pull request #2041 from fabianofranz/master

Minor wording fixes