Merge branch 'master' into coc-qcc
authormayeut <mayeut@users.noreply.github.com>
Thu, 17 Sep 2015 00:12:27 +0000 (02:12 +0200)
committermayeut <mayeut@users.noreply.github.com>
Thu, 17 Sep 2015 00:12:27 +0000 (02:12 +0200)

Trivial merge