Merge remote-tracking branch 'origin/develop'
Removing unused var that caused an error.
Merge branch 'refs/heads/master' into develop