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