Merge commits to 14/10/2013

Merge commits to 14/10/2013