Bringing rev1 into sync with master