Merge from 1.0.x (bugfix for 476).
authorMorgan Deters <mdeters@cs.nyu.edu>
Sat, 8 Dec 2012 14:38:24 +0000 (09:38 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Sat, 8 Dec 2012 14:38:24 +0000 (09:38 -0500)

Trivial merge