Merge branch 'master' into release-1.4.4
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 1 Aug 2013 07:26:57 +0000 (09:26 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 1 Aug 2013 07:26:57 +0000 (09:26 +0200)

Trivial merge