Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Fri, 17 Oct 2014 09:45:05 +0000 (11:45 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Fri, 17 Oct 2014 09:45:05 +0000 (11:45 +0200)

Trivial merge