Merge branch 'trunk'
Merge branch 'trunk'
Removed file Grain.cpp
Add a sort assertion in case options are missing