Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Mon, 11 Aug 2014 11:45:38 +0000 (13:45 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Mon, 11 Aug 2014 11:45:38 +0000 (13:45 +0200)

Trivial merge