rebase master into 0.1.x