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

[Uwe Stöhr]

commit 0f3fc879d0b47c6715b584c542d9f7f5291f70a8
Merge: 175568b 43dd383
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Fri May 22 22:03:13 2015 +0200

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