Pastor 1.8.2
Merge pull request #1432 from leoj3n/pastor-1.8.2

Pastor 1.8.2