Merge branch 'sergeyromanov-patch-1'
John Napiorkowski [Tue, 30 Dec 2014 22:40:04 +0000 (16:40 -0600)]

Trivial merge