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

[Uwe Stöhr]

commit 716f44d5b93f13b3fd9d8e37c5abe4932f70fe38
Merge: d0ca4dd d763840
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Sat Jan 23 16:20:01 2016 +0100

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