Update 13-06-2014
Revert "Update 13-06-2014"

This reverts commit 1320703e055503d49dcd14f03f169aa4b29a7336.
1