Merge branch 'master' into pull_coverage
authorAaron Hill <aa1ronham@gmail.com>
Sat, 17 Aug 2013 20:46:18 +0000 (16:46 -0400)
committerAaron Hill <aa1ronham@gmail.com>
Sat, 17 Aug 2013 20:46:18 +0000 (16:46 -0400)

Trivial merge