We haz planning almost done, and maintainence running along :)
Merge remote-tracking branch 'origin/master'