Blind copy/paste. Whoops. Fix Travis
Merge branch 'lollipop' into menuAdminLollipop