Merge branch 'rta_not_mandatory'
authorJean Privat <jean@pryen.org>
Wed, 12 Feb 2014 19:31:42 +0000 (14:31 -0500)
committerJean Privat <jean@pryen.org>
Wed, 12 Feb 2014 19:31:42 +0000 (14:31 -0500)

Trivial merge