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