Reconciling for merge from master on Rakefile
Merge pull request #555 from shoes/app-proxy_rake

Reconciling for merge from master on Rakefile