Sync'd branch releases/aurora with upstream @ Mon Sep 22 17:59:28 PDT 2014