Merge branches from Master to Nightly

2013-01-23