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