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

Trivial merge