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