Changes made by johnny merged
Revert "Changes made by johnny merged"

This reverts commit a6a1704ac2a0c6c7524e1bae79f9b82655b71a08.
Merge remote-tracking branch 'origin/master'