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