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