Revert "Revert "Update to Master""

This reverts commit 4fc8c702ef67a6ca44df4f3620db6507de381132.