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