commit 11/17/2014
Merge origin/master
commit 11/17/2014
Merge origin/master
commit 11/17/2014