Sync'd branch integration/b2g-inbound with upstream @ Thu Aug 28 10:38:17 PDT 2014