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