Post release 2013 10 17 master

Merge changes in release branch as of release-2013-10-17 tag into master.

Includes several hotfixes that were made only in the release candidate that were not merged separately into master.  The PRs for these hotfixes are 1376, 1382, 1383, 1385, 1388, 1389, 1390 and 1391.