Sync'd branch integration/b2g-inbound with upstream @ Sat Oct 11 08:41:42 PDT 2014