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