Ensuring that it compiles under Vs2012.
Merge remote-tracking branch 'origin/dev-alessio'