Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 22 21:23:48 PDT 2014