Change aintern_convert.h header guard to match 5.1 branch.
Delete unused variable WINDOWINFO wi.
Suppress warnings about unused variable orig_format.
Bump version to 5.0.8 (WIP).
win: Scale window icon to sizes returned by GetSystemMetrics.

(cherry picked from commit e607997dac95a6d5665fc48cbf167ab5a9468f59)
Added alternate US spelling for ALLEGRO_ALIGN_CENTRE to be consistent with spelling of ALLEGRO_COLOR.

(cherry picked from commit 7389482aba3f11c69e65ab12e51fe00d158ef3fa)
Don't use #define unnecessarily.

(cherry picked from commit 3bf6df84eeaa689e9e926785582c2cc2b5a707d9)
Moved D3D display formats stuff into its own file in preparation of trying to fix bugs.

d3d_disp.cpp still is homungous with > 3000 lines, should refactor it some time.

(cherry picked from commit cc61e6b514bf7b4d718b51b95fbb9c1f8e74f319)

Conflicts:
	cmake/FileList.cmake
	src/win/d3d.h
	src/win/d3d_disp.cpp
Rewrote the D3D display format listing code.

It was out of sync with the display options enum and also using invalid
format/depth/stencil combinations. This patch should re-enable
multi-sampling for D3D (which most likely was broken for quite some time)
and also fix bug #3537357 (ex_depth_mask slow with D3D).

The new code also cannot go out of sync the same way anymore and is
hopefully much easier to follow.

(cherry picked from commit 567317ed787861f9a0dee6573f0d2c3c29f6b571)
weapon_S fixed a few small issues in the documentation.

(cherry picked from commit afe10053c2e16cbd1db9d1ca604a7e26926e6f70)
Dennis Gooden fixed a bug with mouse enter/leave events for resized windows, under OSX.

(cherry picked from commit d044a086d1163b2f6f47ea402a75f3ca77ea9a83)
docs: Fix spelling mistakes.

(cherry picked from commit 5d80799ad6da6ac03ce37f2231e610195b479884)
ex_joystick_hotplugging.c: Remove executable bit.

(cherry picked from commit 9e75cd10d0521a28c79e083174f88d812047c1e2)
Fix potential null dereference in al_set_window_position.

In debug mode it still rejects a null pointer.  Many of the window
functions accept null pointers in release mode so I made
al_set_window_position do so as well.  We should clarify the behaviour.

(cherry picked from commit 601b8c029c488f9c652ebfd280da87c8abd1e245)
trex: Delete unused variable.

(cherry picked from commit bd88d10e7ef7bf1be80df890ac5ab2019255269c)
Fix 'physfs.h' and 'Cg/cg.h' not found in project files for 'allegro_monolith' generated by CMAKE.

(cherry picked from commit e469e84703595dde1d494797a472668f323f2348)
Fixed some pyflakes warnings.

(cherry picked from commit b6209f7ddd53da09f07a81ec75aa476d1fa18da9)
Ran the python scripts in the python folder through "pep8" and cleaned up all the style violations.

(cherry picked from commit 75a2f62a47ed73139d5482afbe5a63f4e5568500)
tests: Adjust some primitive tests to cope with reported failure.

Tobias Hansen reported that the hl thick-50 tests were failing on an
i386 chroot on a amd64 host.  The output differs in a single pixel in an
al_draw_spline call.  Adjust the failing tests to draw the spline
without a rotation transform, to minimise floating point differences.

(cherry picked from commit 7653f0a71f1a6d113231997d0c653d62814e9899)
font: Make al_grab_font_from_bitmap argument const.

(cherry picked from commit d211a9ad723bebc6a26ce39b3238468c07dee4d2)