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