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

[Uwe Stöhr]

commit bd3dd7873a3e7a424e90cf24e1f3d65051c67bc2
Merge: 4848c43 d569431
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Sun Jan 31 21:27:47 2016 +0100

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