Removed some profanity.
Merge branch 'master' into dev