Merge branch '1.3/develop' of github.com:fuel/core into 1.3/develop

Author: WanWizard

classes/fieldset/field.php

@@ -336,9 +336,10 @@ public function get_attribute($key = null, $default = null)
 	 *
 	 * @param   string|array  one option value, or multiple value=>label pairs in an array
 	 * @param   string
+	 * @param   bool            Whether or not to replace the current options
 	 * @return  Fieldset_Field  this, to allow chaining
 	 */
-	public function set_options($value, $label = null)
+	public function set_options($value, $label = null, $replace_options = false)
 	{
 		if ( ! is_array($value))
 		{
@@ -361,7 +362,7 @@ public function set_options($value, $label = null)
 			}
 		};
 
-		empty($this->options) ? $this->options = $value : $merge($this->options, $value, $merge);
+		($replace_options or empty($this->options)) ? $this->options = $value : $merge($this->options, $value, $merge);
 
 		return $this;
 	}