Merge pull request #125 from gescheit/maintenance-0.20.x
authorAlexey Andriyanov <andriyanov@users.noreply.github.com>
Fri, 5 Jun 2015 14:07:17 +0000 (17:07 +0300)
committerAlexey Andriyanov <andriyanov@users.noreply.github.com>
Fri, 5 Jun 2015 14:07:17 +0000 (17:07 +0300)
update some ShortenIfNames functions


Trivial merge