Merge pull request #325 from adbre/iss5464