neocotic/template — pull request #128 by neocotic (2013-01-08 09:34:19+00:00)
Title: Merge master into wip-1.2.0

Hopefully this will fix the issue where wip-1.2.0 can't be merged back into master and avoid overwriting master with wip-1.2.0 entirely.