Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Thu, 10 Jul 2014 13:42:22 +0000 (15:42 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Thu, 10 Jul 2014 13:42:22 +0000 (15:42 +0200)

Trivial merge