Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 13 11:23:45 PDT 2014