Merge branch 'release-1.5.3' into oc_framework_cleanup_and_documentation
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 22 Jan 2014 09:29:36 +0000 (10:29 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 22 Jan 2014 09:29:36 +0000 (10:29 +0100)

Trivial merge