Merge branch 'master' into coc-qcc
authormayeut <mayeut@users.noreply.github.com>
Thu, 8 Oct 2015 17:11:52 +0000 (19:11 +0200)
committermayeut <mayeut@users.noreply.github.com>
Thu, 8 Oct 2015 17:11:52 +0000 (19:11 +0200)

Trivial merge