Merge remote-tracking branch 'origin/automationTest' into automationTest
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 8 Jun 2015 09:15:46 +0000 (11:15 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 8 Jun 2015 09:15:46 +0000 (11:15 +0200)

Trivial merge