Merge bug-fix for peformance issue with PlusRemote.

This will fix the issue posted in:
http://na-mic.org/Mantis/view.php?id=3813