Merge remote-tracking branch 'upstream/master'
authormartin-rublik <martin.rublik@gmail.com>
Wed, 21 May 2014 07:22:55 +0000 (08:22 +0100)
committermartin-rublik <martin.rublik@gmail.com>
Wed, 21 May 2014 07:22:55 +0000 (08:22 +0100)

Trivial merge