Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 15 13:00:47 PDT 2014