Fixed problem created when making whole div clickable. -SF
Merge remote-tracking branch 'origin/master'