Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 13 07:18:44 PDT 2014