make print_cpr() use rsync on mac osx
Merge remote-tracking branch 'refs/remotes/origin/development' into bleeding-edge
Merge remote-tracking branch 'refs/remotes/origin/bleeding-edge'