merge from default
merge from default

--HG--
branch : 0.12.0

xbehave/xbehave.net,modulexcite/xbehave.net,modulexcite/xbehave.net,hitesh97/xbehave.net,adamralph/xbehave.net,mvalipour/xbehave.net,mvalipour/xbehave.net,hitesh97/xbehave.net