merge from master
14 jan 2014  Fix: error in StateSetCache was preventing SA sharing.
Merge branch 'develop'