add check for nan, inf on warm starts back in
fix minor overflow bug
Merge remote-tracking branch 'upstream/master'