Dealing with arrays containing nil values gracefully

Signed-off-by: Phan Le <ple@pivotallabs.com>
Auto-merge remote-tracking branch 'upstream/master'