Remove unneeded whitespace
Change wording to make nikki happy
Merge remote-tracking branch 'reosarevok-bitbucket/mbs-5261' into beta

* reosarevok-bitbucket/mbs-5261:
  Change wording to make nikki happy
Merge remote-tracking branch 'reosarevok-bitbucket/mbs-4658' into beta

* reosarevok-bitbucket/mbs-4658:
  Remove unneeded whitespace