Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  8 05:38:59 PDT 2014