Catch up merge from iniju into 2.0.1