Adding the good stuff from st2
Merge remote-tracking branch 'github/master'