Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 14 11:03:44 PDT 2014