Add the primary source
Update to latest upstream versions.
Authored by: mtrute 2014-03-15
Parent: [r7]
Child: [r9]