Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  1 17:11:41 PDT 2014