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

[Kornel Benko]

commit c08a5ade542d971c8e23f86f709279f4491906fa
Merge: 5a9ddb3 08317ec
Author: Kornel Benko <kor...@lyx.org>
Date:   Sun Nov 22 13:57:13 2015 +0100

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