Merge branch 'develop'

* develop:
  Preparing 1.13.1 release
  Fixing yaml parsing stuff
  add translation to password field's placeholder

Resources/views/public/login.blade.php

@@ -22,7 +22,7 @@
             </div>
             <div class="form-group has-feedback {{ $errors->has('password') ? ' has-error' : '' }}">
                 <input type="password" class="form-control"
-                       name="password" placeholder="Password" value="{{ old('password')}}">
+                       name="password" placeholder="{{ trans('user::auth.password') }}" value="{{ old('password')}}">
                 <span class="glyphicon glyphicon-lock form-control-feedback"></span>
                 {!! $errors->first('password', '<span class="help-block">:message</span>') !!}
             </div>