Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Mon, 4 Aug 2014 07:39:17 +0000 (09:39 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Mon, 4 Aug 2014 07:39:17 +0000 (09:39 +0200)

Trivial merge