Merge remote-tracking branch 'spf13/3.0' into 3.0