Fix typo
Merge branch 'master' of ssh://jupiter.ls.fi.upm.es/wstore
Merge branch develop
Merge branch 'develop'
Change importlib by __import__ in order to be python 2.6 compatible
Merge branch 'master' into develop