Removed feature_toggling.
Ruby 2.1.1.
Ruby 2.1.1.
Fixed null cleanup case.
merged usptream and bundle update