Schisamo/1.4 stable

/cc @opscode/server-team