Automated merge with https://bitbucket.org/circuits/circuits-dev/
Automated merge with https://bitbucket.org/circuits/circuits-dev/

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