Imported Upstream version 02.16.2014.04.19