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

[Uwe Stöhr]

commit f9d9a71df49229a17db3b684a8c086d67e8f0f02
Merge: b621975 d4ae233
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Mon Jun 1 20:46:16 2015 +0200

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