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