Original patch from Anik Varshney anik d0t varshney -- gmail d0t com,
that had issues applying (whitespace and git am...)
Fixes from me too.
Close #3045