Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 29 09:55:34 PDT 2014