Merge branch 'version-2'
Graham Knop [Sun, 1 Feb 2015 20:32:15 +0000 (15:32 -0500)]

Trivial merge