* Some uncommitted changes from March, which should finish the development on WSRCore.
Authored by: jmfg 2012-04-24
Parent: [r45]
Child: [r47]
