Sync'd branch integration/b2g-inbound with upstream @ Thu Sep  4 00:28:36 PDT 2014