closes #3086
Merge pull request #1194 from fommil/release-2.1

closes #3086