merged in latest Gemfiles