Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Wed, 6 Aug 2014 15:57:27 +0000 (17:57 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Wed, 6 Aug 2014 15:57:27 +0000 (17:57 +0200)

Trivial merge