Bringing master into sync with rev1