Merge branch 'ftp-2394'
authorBrian Warner <warner@lothar.com>
Tue, 31 Mar 2015 18:07:48 +0000 (11:07 -0700)
committerBrian Warner <warner@lothar.com>
Tue, 31 Mar 2015 18:07:48 +0000 (11:07 -0700)
closes ticket:2394


Trivial merge