Updated OS X target
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	Sources/Core/IOData/iodevice_provider_memory.cpp
Merge pull request #36 from dpjudas/master

Fixes building on OS X