Merge pull request #1685 from sebweb3r/tinchoabbate-patch-1

Hijack #1676