Revert "Revert "Update on 15/8/2014""

This reverts commit 339bd60d0891618939f8bd7036aeab4c49de0d57.
Revert "Revert "Revert "Update on 15/8/2014"""

This reverts commit d117ad232396d6b810d965bbc219a29896a75292.