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