Update from Knockout

pulling in updates from knockout branch