Merge 2014-04-01 Ferguson changes into master