Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 29 06:47:36 PDT 2014