closes WebTales/rubedo#267
Merge branch 'develop' of github.com:WebTales/rubedo into develop
Merge branch 'develop' of github.com:WebTales/rubedo into develop