lookout/Hermann — pull request #3 by stancampbell3 (2014-08-19 21:15:01+00:00)
Title: Merge upstream changes for PART-3886

Merging upstream changes.