Environment variables and path additions are now stored in /etc/profile.d
Merge remote-tracking branch 'origin/master'