Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency
authorJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Fri, 21 Nov 2014 14:31:14 +0000 (15:31 +0100)
committerJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Fri, 21 Nov 2014 14:31:14 +0000 (15:31 +0100)

Trivial merge