Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 13 05:33:41 PDT 2014