Merge branch 'autoSyndrome' into recent

Conflicts:
	plugins/CMakeLists.txt
develop
expwnent 2013-01-05 14:08:14 -05:00
commit 8be68390b3

Diff Content Not Available