Merge branch 'master' into fix-ref-error

diff --cc src/TimePicker.jsx
index 28857a07796da025a5a139d436f6e019ff19353e,e6c203159883c361e9628441e69da8fc77d73c78..da47ac4d9c211192c985f6dbc0d9c88ae60feb8a
--- 1/src/TimePicker.jsx
--- 2/src/TimePicker.jsx
+++ b/src/TimePicker.jsx
@@@ -213,7 -213,8 +214,10 @@@ const Picker = React.createClass(
          <span className={`${prefixCls} ${className}`} style={style}>
            <input
              className={`${prefixCls}-input`}
-             ref={this.saveInputRef} type="text" placeholder={placeholder}
 -            ref="picker" type="text" placeholder={placeholder}
++            ref={this.saveInputRef}
++            type="text"
++            placeholder={placeholder}
+             name={name}
              readOnly
              onKeyDown={this.onKeyDown}
              disabled={disabled} value={value && value.format(this.getFormat()) || ''}