Automated merge with https://code.google.com/p/robotframework/
Automated merge with https://code.google.com/p/robotframework/

userzimmermann/robotframework-python3,Senseg/robotframework,userzimmermann/robotframework-python3,Senseg/robotframework,Senseg/robotframework,Senseg/robotframework,userzimmermann/robotframework-python3,userzimmermann/robotframework-python3,Senseg/robotframework,userzimmermann/robotframework-python3