naparuba/shinken — pull request #1030 by Seb-Solon (2013-11-09 20:21:21+00:00)
Title: Bugfix 383, 897. Same as 918

Created a new PR because the previous on was messy. I've added a test case to ensure no regression.