Syncing with FreeImage master branch