PhaseText + building options
Merge remote branch 'origin/master'