Sync March 27 2014

Syncing with SamSaffron/master, commit 885a8d46cbd67f09bd6a5e686a824759d79d5f78