Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  8 06:23:49 PDT 2014