Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 27 11:14:52 PDT 2014