Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Mon, 22 Sep 2014 09:40:18 +0000 (11:40 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Mon, 22 Sep 2014 09:40:18 +0000 (11:40 +0200)

Trivial merge