Split mixed method into two well defined methods
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/rtwo