Automated merge with https://bitbucket.org/prologic/circuits
Automated merge with https://bitbucket.org/prologic/circuits

treemo/circuits,eriol/circuits,treemo/circuits,treemo/circuits,eriol/circuits,eriol/circuits,nizox/circuits