Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Thu, 24 Jul 2014 16:16:37 +0000 (18:16 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Thu, 24 Jul 2014 16:16:37 +0000 (18:16 +0200)

Trivial merge