fixed wrong warning in import
prevent development.log from growing
Merge branch 'master' into Gaby