[LyX/2.1.x] Merge branch '2.1.x' of git.lyx.org:lyx into 2.1.x

[Uwe Stöhr]

commit 2c3f673c32b2a50734b8427bcbbe4fd205dc3717
Merge: 13edb2e 8c5bdcb
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Mon Feb 9 01:15:23 2015 +0100

    Merge branch '2.1.x' of git.lyx.org:lyx into 2.1.x