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

Trivial merge