Update for language changes
auto merge of #546 : brson/servo/master, r=metajack