forgot to save the current values
Merge remote-tracking branch 'origin/master' into ildipo/minorstuff
Merge pull request #963 from twosigma/ildipo/minorstuff

Ildipo/minorstuff