Slight change from macro to runtime option.
Slight change from macro to runtime option.

Reviewed by me.

kidaa/cappuccino,enquora/cappuccino,krodelin/cappuccino,280north/cappuccino,280north/cappuccino,Rosch/cappuccino,zittix/cappuccino,cappuccino/cappuccino,tancred/cappuccino,deltaprojects/cappuccino,Dogild/cappuccino,Rosch/cappuccino,FrankReh/cappuccino,eventualbuddha/cappuccino,Dogild/cappuccino,enquora/cappuccino,eventualbuddha/cappuccino,cacaodev/cappuccino,AlexanderMazaletskiy/cappuccino,krodelin/cappuccino,eventualbuddha/cappuccino,cappuccino/cappuccino,Dogild/cappuccino,zittix/cappuccino,rgv151/cappuccino,enquora/cappuccino,enquora/cappuccino,AlexanderMazaletskiy/cappuccino,cappuccino/cappuccino,Dogild/cappuccino,rgv151/cappuccino,deltaprojects/cappuccino,krodelin/cappuccino,tancred/cappuccino,rgv151/cappuccino,FrankReh/cappuccino,deltaprojects/cappuccino,Dogild/cappuccino,primalmotion/cappuccino,Rosch/cappuccino,AlexanderMazaletskiy/cappuccino,akshell/cappuccino,280north/cappuccino,deltaprojects/cappuccino,AlexanderMazaletskiy/cappuccino,wangshijin/cappuccino,tolmasky/cappuccino,kidaa/cappuccino,primalmotion/cappuccino,Rosch/cappuccino,deltaprojects/cappuccino,dgvivero/CappCoreData,FrankReh/cappuccino,kidaa/cappuccino,wangshijin/cappuccino,cacaodev/cappuccino,koamac/Cappuccino,deltaprojects/cappuccino,daboe01/cappuccino,dgvivero/CappCoreData,primalmotion/cappuccino,FrankReh/cappuccino,280north/cappuccino,koamac/Cappuccino,enquora/cappuccino,FrankReh/cappuccino,koamac/Cappuccino,cappuccino/cappuccino,zittix/cappuccino,tolmasky/cappuccino,cacaodev/cappuccino,krodelin/cappuccino,zittix/cappuccino,mrcarlberg/cappuccino,koamac/Cappuccino,cacaodev/cappuccino,krodelin/cappuccino,daboe01/cappuccino,zittix/cappuccino,Dogild/cappuccino,rgv151/cappuccino,mrcarlberg/cappuccino,cacaodev/cappuccino,daboe01/cappuccino,tolmasky/cappuccino,mrcarlberg/cappuccino,kidaa/cappuccino,daboe01/cappuccino,tolmasky/cappuccino,dgvivero/CappCoreData,akshell/cappuccino,primalmotion/cappuccino,mrcarlberg/cappuccino,krodelin/cappuccino,Rosch/cappuccino,deltaprojects/cappuccino,mrcarlberg/cappuccino,FrankReh/cappuccino,kidaa/cappuccino,cacaodev/cappuccino,jiangshen/cappuccino,akshell/cappuccino,enquora/cappuccino,wangshijin/cappuccino,rgv151/cappuccino,mrcarlberg/cappuccino,enquora/cappuccino,Rosch/cappuccino,rgv151/cappuccino,eventualbuddha/cappuccino,tancred/cappuccino,cacaodev/cappuccino,krodelin/cappuccino,FrankReh/cappuccino,tancred/cappuccino,akshell/cappuccino,Dogild/cappuccino,cappuccino/cappuccino,280north/cappuccino,zittix/cappuccino,daboe01/cappuccino,AlexanderMazaletskiy/cappuccino,Rosch/cappuccino,jiangshen/cappuccino,tolmasky/cappuccino,primalmotion/cappuccino,wangshijin/cappuccino,cappuccino/cappuccino,zittix/cappuccino,daboe01/cappuccino,dgvivero/CappCoreData,rgv151/cappuccino,mrcarlberg/cappuccino,wangshijin/cappuccino,mrcarlberg/cappuccino,daboe01/cappuccino,tancred/cappuccino,AlexanderMazaletskiy/cappuccino,primalmotion/cappuccino,koamac/Cappuccino,wangshijin/cappuccino,primalmotion/cappuccino,tancred/cappuccino,koamac/Cappuccino,FrankReh/cappuccino,dgvivero/CappCoreData,cappuccino/cappuccino,kidaa/cappuccino