Preparing branch for code reorganization
Authored by: hovercraft-sf 2017-06-27
Parent: [r101]
Child: [r103]