sync 2014-06-28
merged from origin