Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  8 21:33:44 PDT 2014