* Updated gitignore.
Merge remote-tracking branch 'origin/master' into test-bullet-integration-0