Update from master 2013-08-14

45468066ba9dfef359b0bb31d4cdbb8292a13c82
Update from master 2013-08-14

650bcde1642e53cbfbd248a6092ddebb61ce3985
Update from master 2013-09-21

502f26ba1f2172ba9b412797ad88b5d709c123f9
Update from master 2013-09-23

1be9d5e9c0e9ee06c5eb5135704140c39e144dc1
Update from master 2013-09-23

256cf8decf04e7dc9012176d81c90b7128fcd30d