Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 13 06:03:42 PDT 2014