Araq/Nimrod — pull request #1155 by Varriount (2014-04-27 01:31:49+00:00)
Title: Revert "Merge pull request #1139 from bbodi/devel"

My sincerest apologies, but this PR wasn't tested enough, nor should I have pulled it in without dom96's consent.