Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Wed, 1 Oct 2014 13:24:56 +0000 (15:24 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Wed, 1 Oct 2014 13:24:56 +0000 (15:24 +0200)

Trivial merge