Imported Upstream version 2013.05.14
Imported Upstream version 2013.05.23