Revert "Revert "20140901dev""

This reverts commit 0edc3bb61e6652b4579b636bc2a984734a61b152.