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

[Kornel Benko]

commit 69c1a6b04c64b4b70e6e1200eb8f859d9982856b
Merge: 7749f72 a0ed470
Author: Kornel Benko <kor...@lyx.org>
Date:   Fri Aug 15 17:08:40 2014 +0200

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