This might be jumping the gun a little, but I needed to use 3.6 locally and thought I may as well push it upstream.