merge from trunk
merge from trunk

Fuud/spock,alien11689/spock,paplorinc/spock,leonard84/spock,psideleau/spock,sebi-hgdata/spock,sebi-hgdata/spock,GeeChao/spock,GeeChao/spock,Fuud/spock,GeeChao/spock,raphw/spock,Fuud/spock,siordache/spock,sebi-hgdata/spock,lokinell/spock,paplorinc/spock,alien11689/spock,alien11689/spock,psideleau/spock,spockframework/spock,siordache/spock,lokinell/spock,lokinell/spock,paplorinc/spock,Fuud/spock,raphw/spock,raphw/spock,siordache/spock,psideleau/spock