EDIT FROM DESKTOP
Revert "delete"

This reverts commit de45cdb5ab5e403749988ac6da8c6c22aa598a03.
Revert "Revert "delete""

This reverts commit 06cd9b7dcafd05f3b12680b2ba930ee34e32f24e.
Revert "EDIT FROM DESKTOP"

This reverts commit f8f0b3a17f3301af7a78ec5091a94f5185c575a0.
Merge remote-tracking branch 'github/master'