Sync'd branch releases/aurora with upstream @ Mon Sep  8 17:26:32 PDT 2014