Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 17 04:23:23 PDT 2014