Merge branch 'map'
authorJean Privat <jean@pryen.org>
Wed, 5 Mar 2014 15:34:50 +0000 (10:34 -0500)
committerJean Privat <jean@pryen.org>
Wed, 5 Mar 2014 15:34:50 +0000 (10:34 -0500)
fixes #303


Trivial merge