Merge branch 'master' into coc-qcc 551/head
authormayeut <mayeut@users.noreply.github.com>
Wed, 21 Oct 2015 18:45:50 +0000 (20:45 +0200)
committermayeut <mayeut@users.noreply.github.com>
Wed, 21 Oct 2015 18:45:50 +0000 (20:45 +0200)

Trivial merge