Merge from develop to master

Temporary workaround for analytics logger issues.
@Tapjoy/opsautomation