Pull request from cjforman/pele:master on 09/12/14