Backport #18234 to 2014.1

Backport #18234 to 2014.1

Conflicts:
	salt/modules/pkgin.py