Promote 1.9 trunk to master