Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 15 05:03:45 PDT 2014