Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 27 07:21:40 PDT 2014