Merge branch 'foutoucour-master'
authorAaron Hill <aa1ronham@gmail.com>
Wed, 18 Jun 2014 16:38:50 +0000 (12:38 -0400)
committerAaron Hill <aa1ronham@gmail.com>
Wed, 18 Jun 2014 16:38:50 +0000 (12:38 -0400)

Trivial merge