Merge from nicta



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/kevinxyz/scoobi/1)
<!-- Reviewable:end -->