Merge branch 'hotfix/filter_bug' into dev
authorBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Thu, 11 Apr 2013 18:45:31 +0000 (14:45 -0400)
committerBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Thu, 11 Apr 2013 18:45:31 +0000 (14:45 -0400)

Trivial merge