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