CT: 2013 fix
Merge remote-tracking branch 'origin/master'