Issue 636 is fixed
Fixed OSX project (XCode5 compatibility)
v2.5
Fixed pkg-dmg
Merge remote-tracking branch 'origin/master' into next

Conflicts:
	version.h
	whatsnew.txt