Merge remote-tracking branch 'vnwildman/master'

Pat Thoyts committed Jun 29, 2014 at 12:59 UTC df7369f1a786295fc56f3841f67d8517001ed85f

No changes.