Merge argonaut 0.9 into master