Merge from osbzr