Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Thu, 25 Sep 2014 07:43:52 +0000 (09:43 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Thu, 25 Sep 2014 07:43:52 +0000 (09:43 +0200)

Trivial merge