Merge branch 'master' into release

diff --cc manifests/source.pp
index ad80977c68cda73576dbf30b30c06bcd00bbcd54,9cb21338d771a87615ec9595a4548d21dcee458e..a9769ea890c39bcdf098db2fac8e1d043c0a24ae
--- 1/manifests/source.pp
--- 2/manifests/source.pp
+++ b/manifests/source.pp
@@@ -50,13 -99,13 +50,13 @@@ define apt::source
    $header = epp('apt/_header.epp')
  
    $sourcelist = epp('apt/source.list.epp', {
-     'comment'        => $comment,
-     'includes'       => $includes,
-     'architecture'   => $architecture,
-     'allow_unsigned' => $allow_unsigned,
-     'location'       => $location,
-     'release'        => $_release,
-     'repos'          => $repos,
+     'comment'          => $comment,
+     'includes'         => $includes,
+     'opt_architecture' => $architecture,
 -    'allow_unsigned'   => $_allow_unsigned,
++    'allow_unsigned'   => $allow_unsigned,
+     'location'         => $location,
+     'release'          => $_release,
+     'repos'            => $repos,
    })
  
    apt::setting { "list-${name}":

diff --cc spec/defines/source_spec.rb
Simple merge