changed to discrete deadlines/release times
Merge remote-tracking branch 'origin/master'
merge win / mac / linux versions