Upload of Tim Burch's updates for complete show/hide functionality
Merge remote-tracking branch 'choose_remote_name/master'