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