Manual merge of  branch 'hron:lazy-non-audited-columns-for-3.0.0' into rails4