Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 14 07:18:48 PDT 2014