Merge in updates for 10.24.2014

Merges in a number of commits from today for fly-man and greythane