Merge pull request #15 from apache/master

Merge Apache Master 2014/11/24
Merge pull request #16 from apache/master

Used revert to rewind 6 merges, pushed to this repo mistakenly.
Merge pull request #17 from apache/master

Merge Apache Master 2014/12/04
Merge pull request #18 from apache/master

Merge Apache Master 2014/12/08
Removed use of depricated monitors
Fixed mis-spelling