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