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