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