Pulling from pele-python:master on 09/12/14