Merge "Add deprcated macro to newly deprecated Window API" into devel/master