Removal of the coding equivalent of the human appendix.
Merge remote-tracking branch 'origin/development' into development