Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 29 10:04:38 PDT 2014