Include condition's location (class or method name) in message

Closes gh-1787
Merge branch '1.1.x'