Merge branch Master into Nightly

2013-01-21 Nightly