Merge commits to 30/10/2013

Merge commits to 30/10/2013