Merge remote-tracking branch 'upstream/develop' into us4_view_text_files
authorJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Sat, 29 Nov 2014 20:12:51 +0000 (21:12 +0100)
committerJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Sat, 29 Nov 2014 20:12:51 +0000 (21:12 +0100)

Trivial merge