flow: Merged <release> '0.25' to <master> ('default').
v0.25
2016-02-06, Gary Kramlich