Sync'd branch integration/b2g-inbound with upstream @ Thu Aug 28 06:33:37 PDT 2014