Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 20 21:43:42 PDT 2014