removed duplicate var
Merge remote-tracking branch 'origin/master'
travis fixes and conflicts :truck:
travis fixes and conflicts :truck: