[LyX/master] Merge branch 'master' of git.lyx.org:lyx

[Kornel Benko]

commit 42f1f5841809eec3751490a3f1177c7d20e16885
Merge: 1fbcd26 9e135d9
Author: Kornel Benko <kor...@lyx.org>
Date:   Thu Dec 31 15:24:33 2015 +0100

    Merge branch 'master' of git.lyx.org:lyx