Sync'd branch integration/b2g-inbound with upstream @ Thu Aug 28 19:28:35 PDT 2014