Merge pull request #2522 from MartinThoma/moose