Merge pull request #1096 from laanwj/2012_04_tick