Fix a bad previous merge with branch popup-widgets
Fix a bad previous merge with branch popup-widgets

espakm/CTK,sankhesh/CTK,CJGoch/CTK,espakm/CTK,finetjul/CTK,CJGoch/CTK,Heather/CTK,rkhlebnikov/CTK,vovythevov/CTK,mehrtash/CTK,commontk/CTK,Heather/CTK,151706061/CTK,finetjul/CTK,rkhlebnikov/CTK,espakm/CTK,msmolens/CTK,lassoan/CTK,SINTEFMedtek/CTK,ddao/CTK,laurennlam/CTK,laurennlam/CTK,jcfr/CTK,Heather/CTK,vovythevov/CTK,ddao/CTK,fedorov/CTK,lassoan/CTK,AndreasFetzer/CTK,mehrtash/CTK,Sardge/CTK,AndreasFetzer/CTK,sankhesh/CTK,naucoin/CTK,CJGoch/CTK,laurennlam/CTK,AndreasFetzer/CTK,lassoan/CTK,msmolens/CTK,Heather/CTK,naucoin/CTK,naucoin/CTK,fedorov/CTK,Sardge/CTK,ddao/CTK,SINTEFMedtek/CTK,jcfr/CTK,SINTEFMedtek/CTK,sankhesh/CTK,finetjul/CTK,pieper/CTK,Sardge/CTK,CJGoch/CTK,commontk/CTK,151706061/CTK,Sardge/CTK,pieper/CTK,sankhesh/CTK,151706061/CTK,finetjul/CTK,lassoan/CTK,ddao/CTK,AndreasFetzer/CTK,SINTEFMedtek/CTK,danielknorr/CTK,commontk/CTK,fedorov/CTK,151706061/CTK,pieper/CTK,espakm/CTK,CJGoch/CTK,SINTEFMedtek/CTK,commontk/CTK,mehrtash/CTK,rkhlebnikov/CTK,mehrtash/CTK,pieper/CTK,naucoin/CTK,jcfr/CTK,danielknorr/CTK,vovythevov/CTK,jcfr/CTK,msmolens/CTK,jcfr/CTK,151706061/CTK,vovythevov/CTK,danielknorr/CTK,laurennlam/CTK,rkhlebnikov/CTK,msmolens/CTK,fedorov/CTK,danielknorr/CTK