Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 29 12:29:35 PDT 2014