Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  1 12:48:44 PDT 2014