Update from master, with changes for knockout 3