Bring branch up to date with master 2014-10-23

Bring the branch up to date with the master copy.