Merge remote-tracking branch 'upstream/master'
authormartin-rublik <martin.rublik@gmail.com>
Mon, 2 Jun 2014 09:49:01 +0000 (10:49 +0100)
committermartin-rublik <martin.rublik@gmail.com>
Mon, 2 Jun 2014 09:49:01 +0000 (10:49 +0100)

Trivial merge