Sync'd branch releases/aurora with upstream @ Mon Sep 29 00:43:31 PDT 2014