fixed tests after pull request 279
Merge remote-tracking branch 'origin/master'
Updated .gitignore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore