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