Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Tue, 23 Sep 2014 13:27:18 +0000 (15:27 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Tue, 23 Sep 2014 13:27:18 +0000 (15:27 +0200)

Trivial merge