Fix for bug IGIRTC-153.
Merge branch 'master' of https://github.com/prelz/BLAH