Merge pull request #592 from CoderLisa/master

Merge jenkins-working-branch after 2.8.1 release