Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Tue, 5 Aug 2014 14:06:51 +0000 (16:06 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Tue, 5 Aug 2014 14:06:51 +0000 (16:06 +0200)

Trivial merge