Fix sync import
Fix for thread local storage changes
Merge pull request #247 from bjz/rustup

Fix for rust updates
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/callbacks.rs