Merge pull request #1502 from dp-arm/dp/irc