Merge branch 'devlopment'
Revert "Merge branch 'devlopment'"

This reverts commit c1c04bad8dbde9914bc588492fe14d96bd13a586, reversing
changes made to ca13ec8ab9c8f2c6e759a1a90fa8d35771ab5f15.
Merge branch 'master' into devlopment