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