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