Merge branch 'master' into free-refcount-ids
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 13 Oct 2015 12:41:33 +0000 (14:41 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 13 Oct 2015 12:41:33 +0000 (14:41 +0200)

Trivial merge