Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
	core/version.h
frameworks
Montel Laurent 12 years ago
commit 526d299ddf

Diff Content Not Available