Fixed critical bug in __of1x_get_time_ms() for 32bit compilers leading to dead-lock in timers.
Merge remote-tracking branch 'origin/devel-0.4' into devel-0.5

Conflicts:
	CHANGES