Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 11 11:53:37 PDT 2014