Incorporate changes to knockout:master