Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 29 22:53:33 PDT 2014