Merge branch 'master' into topic/more-compatible

Conflicts:
	t/800_shikabased/013-compatibility-get_method_list.t

diff --cc t/800_shikabased/013-compatibility-get_method_list.t
index 4b5b124,735d5c3..f197ca6
--- 1/t/800_shikabased/013-compatibility-get_method_list.t
--- 2/t/800_shikabased/013-compatibility-get_method_list.t
+++ b/t/800_shikabased/013-compatibility-get_method_list.t
@@@ -1,20 -1,26 +1,22 @@@
  use strict;
  use warnings;
- use Test::More tests => 6;
+ use Test::More;
+ plan skip_all => "This test requires Moose 0.91" unless eval { require Moose; Moose->VERSION(0.91); };
+ plan tests => 6;
  
 -test($_) for qw/Moose Mouse/;
 -exit;
 -
 -sub test {
 -    my $class = shift;
 -    eval <<"...";
  {
 -    package ${class}Class;
 -    use ${class};
 +    package MouseClass;
 +    use Carp; # import external functions (not our methods)
 +    use Mouse;
      sub foo { }
 -    no ${class};
 +    no Mouse;
  }
  {
 -    package ${class}ClassImm;
 -    use ${class};
 +    package MouseClassImm;
 +    use Carp; # import external functions (not our methods)
 +    use Mouse;
      sub foo { }
 -    no ${class};
 +    no Mouse;
      __PACKAGE__->meta->make_immutable();
  }
  {