Update
auto merge of #3 : bhearsum/servo/featu, r=bhearsum