Sync'd branch integration/b2g-inbound with upstream @ Wed Aug 27 20:21:35 PDT 2014