Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 29 20:08:41 PDT 2014