Sync'd branch integration/b2g-inbound with upstream @ Thu Oct  2 07:13:38 PDT 2014