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