Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 27 10:43:48 PDT 2014