Merge branch 'refs/heads/develop3'
Update component version

I'm updating master with travis info to see if fixes travis build
Merge remote-tracking branch 'origin/master' into develop