merge
Merge remote-tracking branch 'kelley/master'
Fixed issue #605.
Removed upgrade logs
And 1 more upgrade log removed.
Merge pull request #608 from drilus/master

Fixed #605.