Version 14 Odereddict 2.6
Merge remote-tracking branch 'origin/master'

Conflicts:
	pythonsol/DelayToCount.py