Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Wed, 5 Nov 2014 16:41:11 +0000 (17:41 +0100)
committerMorgan Deters <mdeters@cs.nyu.edu>
Wed, 5 Nov 2014 16:41:11 +0000 (17:41 +0100)

Trivial merge