Cleanup
Merge remote-tracking branch 'trunk/master'
 Code cleanup