Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Wed, 16 Jul 2014 07:13:38 +0000 (09:13 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Wed, 16 Jul 2014 07:13:38 +0000 (09:13 +0200)

Trivial merge