Removed unnecessary casts.
Merge branch 'origin/master'