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