pull changes from master to jenkins on 2014-09-22

Bring approved pulls to the jenkins branch so they can be loaded on jenkins.buttonweavers.com.