nddrylliog/rock — pull request #577 by shamanas (2013-02-14 09:43:03+00:00)
Title: Closes #564

Also, get up to date with master