Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 29 00:18:36 PDT 2014