Merge release into master (with changes from Friday 10/24/14)

@rlucioni Looks okay?

FYI: @martynjames I'm going to merge this as soon as tests pass in Jenkins, at which point you'll be able to cut the RC.