Fixes #1213
+1
I'm happy enough to see this go that I'll go ahead and merge this.
Pull-Request has been merged by tibbs
Fixes #1213