cmip5connection - fixes for some special cases
Merge branch 'github/master'

Conflicts:
	dataConnections.py