I pick up AND DROP triangles whenever I feel like it.
Merge branch 'ryland' into micah