Updated to reflect the Auno merge of 2014-02-21.