AutoCommit: 2014-05-16 20:20:03.864429
Merge branch 'smp'