Added Timing Method Override Settings
Merged in Timing Method Override Settings
Merge branch 'Incalex-1.5' into 1.5