AutoCommit: 2014-05-14 16:52:05.017648
Merge branch 'master' into smp
Merge branch 'smp'