Merge remote-tracking branch 'tile/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:50:19 +0000 (10:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:50:19 +0000 (10:50 +1100)

Trivial merge