Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 17 09:08:48 PDT 2014