cherry pick looks fine

lib/associations/has-one.js

@@ -53,7 +53,12 @@ module.exports = (function() {
       var customEventEmitter = new Utils.CustomEventEmitter(function() {
         obj[self.accessors.get]().success(function(oldObj) {
           if(oldObj) {
+<<<<<<< HEAD
             oldObj[self.identifier] = null
+=======
+            console.log(self.options);
+            oldObj = Utils.setAttributes(oldObj, self.identifier, null)
+>>>>>>> 03b8bfa... option renamed to omitNull. Ignores both null and undefined. Tested and working for postgres and sqlite
             oldObj.save()
           }
 

lib/query-interface.js

@@ -5,6 +5,7 @@ module.exports = (function() {
   var QueryInterface = function(sequelize) {
     this.sequelize = sequelize
     this.QueryGenerator = require('./dialects/' + this.sequelize.options.dialect + '/query-generator')
+	 this.QueryGenerator.options = this.sequelize.options;
   }
   Utils.addEventEmitter(QueryInterface)