Merge commits to 19/09/2013

Merge commits to 19/09/2013