Update features to 2.0.
Merge remote-tracking branch 'vopros/master'