Fix problem with popupMenu's hide
Merge remote-tracking branch 'origin/c1_aug2012' into c1_aug2012