sudo -E rm -f test.sh rm -f test.sh  needed to use env vars set by other user when puppet run with sudo
Merge branch 'django1.7' of https://github.com/rdiankov/openrave.org into django1.7