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

Trivial merge