Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 17 01:26:39 PDT 2014