Merge remote-tracking branch 'working/user/berick/lp1409055-python-https-via-dbs...
authorDan Scott <dscott@laurentian.ca>
Fri, 19 Jun 2015 18:34:53 +0000 (14:34 -0400)
committerDan Scott <dscott@laurentian.ca>
Fri, 19 Jun 2015 18:34:53 +0000 (14:34 -0400)

Trivial merge