Merge up ssh fixes from 2014.7 to develop