Merge branch '2.0'
authorOlivier Goffart <ogoffart@woboq.com>
Mon, 31 Aug 2015 12:34:04 +0000 (14:34 +0200)
committerOlivier Goffart <ogoffart@woboq.com>
Mon, 31 Aug 2015 12:34:04 +0000 (14:34 +0200)

Trivial merge