Do a null check on shuffle params
Upped Build: 3.7.0
Small Fix, Upped Build: 3.7.0
Don't use isEmpty: not supported until 2.3
Upped version: 3.7.1
Get rid of another String.isEmpty()
Upped Version: 3.7.2
Merge remote-tracking branch 'upstream/master' into hedwig34