Merge commits to 12/09/2013

Merge commits to 12/09/2013