Update 20141021

Signed-off-by: David Sterba <dave@jikos.cz>