On branch master (temp)

- for merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	configs/msvc2010/glf.suo
	demos/grass/msvc2010/grass.suo