20140920 - Major fixes for this release