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