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