Merge remote-tracking branch 'upstream/2014.1' into 2014.1
Merge branch '2014.1' of github.com:cro/salt into 2014.1