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

[Uwe Stöhr]

commit f5fb48cdb5038a6fbb8e976f7a5829fa09f1c262
Merge: e7e5bfc b73a599
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Mon Apr 28 22:27:19 2014 +0200

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