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